Allow NULL to mean the default manager. (#344530, John Finlay)

2006-06-10  Matthias Clasen <mclasen@redhat.com>

        * gtk/gtkrecentchooserwidget.c
        (gtk_recent_chooser_widget_new_for_manager):
        * gtk/gtkrecentchoosermenu.c
        (gtk_recent_chooser_menu_new_for_manager):
        Allow NULL to mean the default manager.  (#344530,
        John Finlay)

diff --git a/ChangeLog b/ChangeLog
index 4cdf3ddbe8656d7e77f13647feb99001f57eb6b7..c1f14176d037c64c27bcd395ad8b56070098a44b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2006-06-10  Matthias Clasen <mclasen@redhat.com>
 
+       * gtk/gtkrecentchooserwidget.c 
+       (gtk_recent_chooser_widget_new_for_manager):
+       * gtk/gtkrecentchoosermenu.c
+       (gtk_recent_chooser_menu_new_for_manager): 
+       Allow NULL to mean the default manager.  (#344530, 
+       John Finlay)
+
        * gtk/gtkprintoperation-unix.c (page_setup_data_free):
        Check if rdata->page_setup is set before unreffing it. 
        (#344518, Christian Persch)

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 4cdf3ddbe8656d7e77f13647feb99001f57eb6b7..c1f14176d037c64c27bcd395ad8b56070098a44b 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,12 @@
 2006-06-10  Matthias Clasen <mclasen@redhat.com>
 
+       * gtk/gtkrecentchooserwidget.c 
+       (gtk_recent_chooser_widget_new_for_manager):
+       * gtk/gtkrecentchoosermenu.c
+       (gtk_recent_chooser_menu_new_for_manager): 
+       Allow NULL to mean the default manager.  (#344530, 
+       John Finlay)
+
        * gtk/gtkprintoperation-unix.c (page_setup_data_free):
        Check if rdata->page_setup is set before unreffing it. 
        (#344518, Christian Persch)

diff --git a/gtk/gtkrecentchoosermenu.c b/gtk/gtkrecentchoosermenu.c
index aa5facd717baddfd97778c36423b40c4136eb23d..6b87ce0a43627793997d3d6ff2d8d2256f7a5a6e 100644 (file)
--- a/gtk/gtkrecentchoosermenu.c
+++ b/gtk/gtkrecentchoosermenu.c
@@ -1179,7 +1179,7 @@ gtk_recent_chooser_menu_new (void)
 GtkWidget *
 gtk_recent_chooser_menu_new_for_manager (GtkRecentManager *manager)
 {
-  g_return_val_if_fail (GTK_IS_RECENT_MANAGER (manager), NULL);
+  g_return_val_if_fail (manager == NULL || GTK_IS_RECENT_MANAGER (manager), NULL);
   
   return g_object_new (GTK_TYPE_RECENT_CHOOSER_MENU,
                       "recent-manager", manager,

diff --git a/gtk/gtkrecentchooserwidget.c b/gtk/gtkrecentchooserwidget.c
index a3be54418578daf07b2744533c7f5693444125df..721dcb8f2fa3cd8e020a666abbf775c415a2d47e 100644 (file)
--- a/gtk/gtkrecentchooserwidget.c
+++ b/gtk/gtkrecentchooserwidget.c
@@ -183,7 +183,7 @@ gtk_recent_chooser_widget_new (void)
 GtkWidget *
 gtk_recent_chooser_widget_new_for_manager (GtkRecentManager *manager)
 {
-  g_return_val_if_fail (GTK_IS_RECENT_MANAGER (manager), NULL);
+  g_return_val_if_fail (manager == NULL || GTK_IS_RECENT_MANAGER (manager), NULL);
   
   return g_object_new (GTK_TYPE_RECENT_CHOOSER_WIDGET,
                       "recent-manager", manager,